Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Amazon Managed Grafana new licensing model #38743

Merged
merged 6 commits into from
Aug 8, 2024
Merged

Amazon Managed Grafana new licensing model #38743

merged 6 commits into from
Aug 8, 2024

Conversation

carlosrodgut
Copy link
Contributor

@carlosrodgut carlosrodgut commented Aug 7, 2024 •
edited
Loading

Description

Introduce the Amazon Managed Grafana new licensing model that requires a GrafanaToken generated on GrafanaLabs side.

The GrafanaToken grants access to a set of Grafana Enterprise Plugins.

Relations

Closes #38535

References

Output from Acceptance Testing

% make testacc TESTARGS='-run=TestAccGrafana_serial/LicenseAssociation' PKG=grafana

make: go1.22.6 ready
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.6 test ./internal/service/grafana/... -v -count 1 -parallel 20  -run=TestAccGrafana_serial/LicenseAssociation -timeout 360m
=== RUN   TestAccGrafana_serial
=== PAUSE TestAccGrafana_serial
=== CONT  TestAccGrafana_serial
=== RUN   TestAccGrafana_serial/LicenseAssociation
=== RUN   TestAccGrafana_serial/LicenseAssociation/enterpriseFreeTrial
    license_association_test.go:26: ENTERPRISE_FREE_TRIAL has been deprecated and is no longer offered
=== RUN   TestAccGrafana_serial/LicenseAssociation/enterpriseGrafanaToken
    license_association_test.go:67: Grafana token is invalid
--- PASS: TestAccGrafana_serial (0.00s)
    --- PASS: TestAccGrafana_serial/LicenseAssociation (0.00s)
        --- SKIP: TestAccGrafana_serial/LicenseAssociation/enterpriseFreeTrial (0.00s)
        --- SKIP: TestAccGrafana_serial/LicenseAssociation/enterpriseGrafanaToken (0.00s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/grafana	12.945s

@carlosrodgut carlosrodgut requested a review from a team as a code owner August 7, 2024 16:08
@github-actions GitHub Actions
Copy link

github-actions bot commented Aug 7, 2024

Community Note

Voting for Prioritization

  • Please vote on this pull request by adding a 👍 reaction to the original post to help the community and maintainers prioritize this pull request.
  • Please see our prioritization guide for information on how we prioritize.
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request.

For Submitters

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
  • Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

@github-actions github-actions bot added tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/grafana Issues and PRs that pertain to the grafana service. needs-triage Waiting for first response or review from a maintainer. labels Aug 7, 2024
github-actions[bot]
github-actions bot reviewed Aug 7, 2024
View reviewed changes
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Welcome @carlosrodgut 👋

It looks like this is your first Pull Request submission to the Terraform AWS Provider! If you haven’t already done so please make sure you have checked out our CONTRIBUTOR guide and FAQ to make sure your contribution is adhering to best practice and has all the necessary elements in place for a successful approval.

Also take a look at our FAQ which details how we prioritize Pull Requests for inclusion.

Thanks again, and welcome to the community! 😃

@carlosrodgut carlosrodgut force-pushed the f-grafana-new-licensing-model branch from be12fea to ef5793f Compare August 7, 2024 17:34
@carlosrodgut
Copy link
Contributor Author

Hi team,

That is my first PR on a Hashicorp repository.
I would expect to get the instruction to sign the https://www.hashicorp.com/cla.

Is that still required?

@carlosrodgut carlosrodgut force-pushed the f-grafana-new-licensing-model branch from ef5793f to a3f9cf5 Compare August 8, 2024 08:32
@carlosrodgut carlosrodgut force-pushed the f-grafana-new-licensing-model branch from a3f9cf5 to 17dcda3 Compare August 8, 2024 09:02
@ewbankkit ewbankkit added enhancement Requests to existing resources that expand the functionality or scope. and removed needs-triage Waiting for first response or review from a maintainer. labels Aug 8, 2024
@ewbankkit ewbankkit self-assigned this Aug 8, 2024
@github-actions github-actions bot added the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Aug 8, 2024
ewbankkit
ewbankkit approved these changes Aug 8, 2024
View reviewed changes
Copy link
Contributor

@ewbankkit ewbankkit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccGrafana_serial/LicenseAssociation' PKG=grafana
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.6 test ./internal/service/grafana/... -v -count 1 -parallel 20  -run=TestAccGrafana_serial/LicenseAssociation -timeout 360m
=== RUN   TestAccGrafana_serial
=== PAUSE TestAccGrafana_serial
=== CONT  TestAccGrafana_serial
=== RUN   TestAccGrafana_serial/LicenseAssociation
=== RUN   TestAccGrafana_serial/LicenseAssociation/enterpriseFreeTrial
    license_association_test.go:26: ENTERPRISE_FREE_TRIAL has been deprecated and is no longer offered
=== RUN   TestAccGrafana_serial/LicenseAssociation/enterpriseGrafanaToken
    license_association_test.go:67: Grafana token is invalid
--- PASS: TestAccGrafana_serial (0.00s)
    --- PASS: TestAccGrafana_serial/LicenseAssociation (0.00s)
        --- SKIP: TestAccGrafana_serial/LicenseAssociation/enterpriseFreeTrial (0.00s)
        --- SKIP: TestAccGrafana_serial/LicenseAssociation/enterpriseGrafanaToken (0.00s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/grafana	4.961s

@ewbankkit
Copy link
Contributor

@carlosrodgut Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 5c2b9db into hashicorp:main Aug 8, 2024
47 checks passed
@github-actions github-actions bot added this to the v5.62.0 milestone Aug 8, 2024
@carlosrodgut carlosrodgut deleted the f-grafana-new-licensing-model branch August 8, 2024 17:03
@github-actions GitHub Actions
Copy link

github-actions bot commented Aug 9, 2024

This functionality has been released in v5.62.0 of the Terraform AWS Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

@github-actions github-actions bot removed the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Aug 9, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Sep 9, 2024

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 9, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@ewbankkit ewbankkit ewbankkit approved these changes

Assignees

@ewbankkit ewbankkit

Labels
enhancement Requests to existing resources that expand the functionality or scope. service/grafana Issues and PRs that pertain to the grafana service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v5.62.0
Development

Successfully merging this pull request may close these issues.

[Enhancement]: Amazon Managed Grafana new licensing model
2 participants
@carlosrodgut @ewbankkit